From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Wed, 21 Apr 2010 22:57:48 +0000 (+0000)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~19^2~25^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6c57bf3f72e7ac86d3964c40b513d9248678140e;p=emacs.git

Merge from mainline.
---

6c57bf3f72e7ac86d3964c40b513d9248678140e